Merge commit 'EMACS_22_3' into deb/emacs22/d/sid/upstream
authorRob Browning <rlb@defaultvalue.org>
Fri, 5 Sep 2008 16:23:48 +0000 (11:23 -0500)
committerRob Browning <rlb@defaultvalue.org>
Fri, 5 Sep 2008 16:23:48 +0000 (11:23 -0500)

Trivial merge